Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev. am: 040684499e
am: b327e42e0f

Change-Id: I7e061eaab6aaad2796119b36a5f040e66d64d7df