Merge bbefb0322a34f03637a6471938ccaf3233103a26 on remote branch

Change-Id: I13bf2b154ea1a9bafca29e93b7ff0e5de32d58d8