[automerger skipped] Merge changes from topic "am-ee7381fd1a8845c99ba642b88f8db9d4" into stage-aosp-master
am: f2b4fcba -s ours
am skip reason: change_id Ib152f97711441fded998a36528ef007f9e28ccbf with SHA1 27ff4071 is in history
Change-Id: I91228bb25d5d27440dbb8fe6297dfc91ac83bec5