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

Change-Id: Idf23b6cb1b4e98028b3fd5d9d5a3ca5c311d3809