Merge "Merge "Fix ITS Scene5 fails on Mac" into nougat-cts-dev am: 5896256327" into nougat-mr1-cts-dev
am: 7795e92bcc

Change-Id: Ic506e5ca8ea178e974a40a054c7da87b8e391abd