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