Merge db24ac4621775848c9a66c74897b61f51f9527b8 on remote branch

Change-Id: I69d69e6e879d80001b216aec9a643c704be781b5