Merge changes from topic 'cherry-pick' am: e3d5fa1094 am: 12b4883032
am: e8e0ee0789

Change-Id: I94b162cbd783573c629fcd50a3eb11db0d003441