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

Change-Id: I01817f98525e2586405b94c2a8e00023791e6036