Merge "Merge "Merge "DO NOT MERGE:" into marshmallow-cts-dev am: b4f46122bc  -s ours" into nougat-cts-dev am: 988184b164  -s ours" into nougat-mr1-cts-dev
am: d234e33ff8  -s ours

Change-Id: Ic9862fcf9503329bbd660bee380bea68905878ab