Merge remote-tracking branch 'toybox/master' into HEAD am: 4cce9b0f49
am: b70edb5cc9

Change-Id: I4f9709b23aeeb6ba80d1b0ccbce921e3b7054744