Merge "Merge "Merge changes from topic 'am-acab8711cae74de9969aacda7363466a' into nougat-cts-dev am: 3523f7d4f2 am: fdc166b6b5 am: fdb292c241 am: c50a48473d am: c42749307f am: 26b3ec74ed am: a19057d882 am: 957ca65298" into oc-dr1-dev-plus-aosp am: c5a1df11b9" into oc-mr1-dev-plus-aosp
am: 8a3c3975fd

Change-Id: Iaa7d7ccb9fe759a28f1e055984e218f08320c82b