Merge changes from topic "cherry-picks" am: a1c2f7f6c6 am: 8724a39616
am: ab86455f66

Change-Id: I9b0d2aa481a04fbfd7ae18d563b08fd261cbd750