Merge d4cba156f027c4b0f18afeddb97adcbf392f840e on remote branch

Change-Id: Ie8f73fb37a5b00c538f626cfa204962765a0cf6a