Merge 22740dc5285475fc262a27e318eb4b1ecb6c5c3e on remote branch

Change-Id: Ib310cad7e7d6a73796c3c7a67ab78ff0dfd228a9