Merge "Work around for 910-method with D8"
am: 460e09c5a5

Change-Id: Id55904e3949be76d7a2aaf24ca8e1ea3f9bcdf77