Merge changes Id6d23112,I474dd0c0 am: 6420708d76 am: 50220859dc
am: 87762f1429

Change-Id: Id0a7d0fa42bb7ef0c550c72640bd123d77518220