Change-Id: I6946290cd890f74c59ed5394e8382a8b75c0c4cd (cherry picked from commit a77b0f624ea3d7a1640cf4aefbee007422806690)