[automerger skipped] resolve merge conflicts of 07590428 to stage-aosp-master
am: 61af507a -s ours
am skip reason: change_id I087c2d130cb58c1f61aaf86f52e4822952880e1a with SHA1 bddd8ec7 is in history
Change-Id: If13067300671770d0b051369e0091455e28c6985