[automerger skipped] Merge commit '67c932ce' into art-file-create am: 7b1b6673
am: 89cb524e -s ours
am skip reason: change_id Ic4dae399a5bfe862aff3d8614c45b38044d805db with SHA1 d224e964 is in history
Change-Id: Ib361834ba5181c3c3b0afdded83f49e40656b684