Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev am: 2aa19448cf  -s ours
am: bb26711fdd

Change-Id: Icef427c7bca9c030a987d46b4857710f4f353bd2