Merge remote-tracking branch 'toybox/master' into HEAD am: a379d5ee15 am: a4f4fa78eb am: cb13c3da93
am: e1097aac54

Change-Id: Iff86c560c17b70f8bf1de96b42fa3224bc2e1c9e