Merge 653143db14befc5c0c5703eec723360d07a9ca0a on remote branch

Change-Id: I42fc13418d051796631f37642505e6ee40b42e2f