Merge "Update to 7.60.0 - May 15 2018." am: ab13512c31
am: 93f4ca568a

Change-Id: Ice8c73be04a1df560fd7c9f29d2a93eb893b513f