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

Change-Id: I1ac29134c3a344436f4d60c6487e447a7e7698c8