Merge "It's API 30 time!" am: 601a9d61b8 am: 664d6d6889
am: 86ca2c83b7

Change-Id: I9ad648cbf03e197dd4976ce739d32a3fa5e54526