Reset master to upstream
am: 507cd9883a

Change-Id: I3fd4b4c61f5c668fb75f74417163738b904f6e0d