Merge commit '219b580fed7916ed4e02dd634e003073f91c6b93' into manual_merge_219b580fe

Test: pass
Change-Id: Ic796fced51004d4a716c754fc8c0d347c33af8ff