[automerger skipped] Merge commit '67c932ce050e80b9bf23b15b24d9aed1a2ee209d' into art-file-create am: 7b1b6673e3 am: 89cb524ea7 -s ours
am: d55574c730 -s ours
am skip reason: change_id Ic4dae399a5bfe862aff3d8614c45b38044d805db with SHA1 d224e964bd is in history

Change-Id: I95af592d7c996a9faff51204f29e42f6913cdc0b