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

Change-Id: I968106bf68ef483bdfe0dc0b62a41a3186e3c3c8