[automerger skipped] Merge changes  into pi-dev-plus-aosp
am: db204d5d05  -s ours

Change-Id: Id2d191ae22884f4380c087ec2aebe7bbbe180e5c