Merge "Tweak for b/37809561." into oc-dev am: ca50e88b6b
am: 07db193ebc

Change-Id: I1f2580577da505bb11fdb0445c2d30e87f632a48