Merge "Merge "[automerger skipped] Merge changes Icf03f341,I904f82a3,I9b5d58a1 into nougat-mr1-cts-dev am: 5a6aab6683 -s ours am: 0a7e76b925 -s ours
am: 41d0038bcb -s ours
am skip reason: change_id Icf03f341f55f97a43db5e8dcdf3da75c24e041ef with SHA1 67f3fd5a36 is in history

Change-Id: Ibfa0f877dd01a3f10d9eba3ee4afd9b5584e1671