Mirroring changes from mainline repo:

Change-Id: Ic027f97f8fce6c673c9f2c02a92abaeedfedeb97
Change-Id: I5366a05d657ceaad18c03b95cd71f5d1107200e2

# this patchset's changeid
Change-Id: I446e6afcb561669f95edb7de7974ac9899644168
4 files changed