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