Merge changes from topic "am-273019da1a614490a6411173dbdc66ec"

* changes:
  Merge changes from topic "n" into nougat-cts-dev am: 4562872b9f am: ad91b75d2a am: 49f74f5104 am: a21e60d355 am: bdee27ac37 am: 71ffe5662d am: 70e8cb28c8 am: cffe44e287 am: 7146749bef am: e70e48dcd9
  DO NOT MERGE: CTS test for fix of b/65717533 am: 50d956befd  -s ours am: 3d30b87e48 am: 3ede4c2885 am: eb68dd826a am: 6a06c1c9b5 am: a4471a9996  -s ours am: bd56cc0f25 am: ae516797f3 am: b3c3a48908 am: 37a212ba01  -s ours