Merge "Mark nougat-mr1-cts-dev revision 2aa19448cfc0dbd159e1f7dcad3e622ac08eb1d0 in master as merged."
am: 95880e5eb1

Change-Id: I7aceaae900e7b8d624986a7a1a126603f0b7c41e