Merge fb3064ac8f1d21c35f8cb9715545b23d9d036709 on remote branch

Change-Id: Ia49f0ce7e98d0123dc573bff8664cc88a361b322