Merge branch 'wyh'

Change-Id: I0d166871ac499e4aad801cef52c8520e9a4b727c