Merge 44f00c3cad879ded1c991e0046bb9af2c72f9b1a on remote branch

Change-Id: Iaa3491e9d4dc32a5ea467f4efd03026be4af91d7