Merge changes from topic "n1" into nougat-mr1-cts-dev
am: d0b3e601e8

Change-Id: I55cb6dba5fc42f3cee68b50b69307dac3efabc93