Code drop from //branches/cupcake/...@124589

Change-Id: I28d6daea783c62ef14105593ffc3a0ca6a584339
3 files changed