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