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

Change-Id: Ifa9b83176a6f81c6472d2a931a4771615cd5f229