Initial merge with upstream am: cef92d673c am: c5f71e95df am: e50b3b7561 am: c47b5481de

Change-Id: I60cd10aaa1168a8cce849ed224868bd4e5463123