[automerger skipped] Merge changes from topic "art-without-bionic" am: 0c100685dc am: 9c72fb6f08 am: eefb793749 am: d1bd142df1
am: b0552db35a -s ours
am skip reason: change_id I27069b20f7c7068b931340f548b284ce1676466c with SHA1 b85cf57421 is in history

Change-Id: I5ba51fe8d3c6d931ecdbe9c29256fbcacce9e4a1