Merge mirror-aosp-marshmallow-cts-dev revision 016c30e8 into mnc-dev. am: 120f2701 Change-Id: I98f2295612d7790dc24edac2a7a370296288b82f