Merge b1b06ddd1527c73d184bde99c655944a9dd93f63 on remote branch

Change-Id: I476c628ae93b076fd9c4c1154c4318f2a244f5ce