Merge changes from topic "art-without-bionic" am: 0c100685dc am: 9c72fb6f08
am: eefb793749

Change-Id: I400f993a7db343375d79b2657c36c699317d5596