Merge commit '67c932ce050e80b9bf23b15b24d9aed1a2ee209d' into art-file-create
am: 7b1b6673e3

Change-Id: I87e697497e533817bf7a00610f4f1d17f626b5e2