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

Change-Id: I7ecbf3e077cdd9b06e9c1a13455c572c6f21c00e