Merge "Add a check to investigate b/37893215." into oc-dev am: bf3423a939
am: 0fd64da271

Change-Id: I81299b9a3610c205a9de4b2df248c76c5dd2908c