Merge commit 'ae63546d19f91931a9a05015b149ddc19091c895' into manual_merge_ae63546d19f91931a9a05015b149ddc19091c895

Change-Id: Ic7b8ec208eaed5fc3a9f5ee90dac5ffeb9a18543