Merge "Fix ITS Scene5 fails on Mac" into nougat-cts-dev am: 5896256327 am: cf0ff3cbdf am: 59b892de11 am: 4e87fa6a5e am: 567240e871 am: 607d797b2e
am: 17a8f6ca89

Change-Id: Ic9f2c97bd28acdad0525007f0c4195e1b866f729