Merge changes from topic "b66921961" am: 10b76c15f9
am: 7efaa260f8

Change-Id: Ieac368389b16ca0d74a82629d511dbe95d9dd077