Merge changes from topic \'cherry_pinner\'
am: edec0eb18d

Change-Id: Ie07251a8addccdfbfa642b586bc05ed2cfac1b07