Reconciliation with internal master

Change-Id: Ibee29895a51235f083a585a8e3263fa5b8dab004