Merge ae8dec011831536a5a9ea36305f13fed9a38e50e on remote branch

Change-Id: Ieffec3d7bebfc43e10b7f7371c06341145e26b55