Merge remote-tracking branch 'toybox/master' into HEAD am: cae4495189
am: 49859ac043

Change-Id: Ida3960044f60cf7df388c3cd018a554661331815