Merge changes from topic "n" into nougat-cts-dev
am: 7d7e8dd04b

Change-Id: I7cfa588ca8cff7722d4ed2fef55953ff27bece9b