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

Change-Id: Ifa332e76292c818efe9153b01ac6dc660b9672c6