Merge mirror-aosp-marshmallow-cts-dev revision 016c30e8 into mnc-dev. am: 120f2701 am: b7465ab1 am: 779a7f07 Change-Id: I15367feb83ef4332b06589889b4e05ef8d5cc582