Sync with CM at commit 2e01b7b4d61d5ed40ce671d9e3375058bcb559f1

Change-Id: I9c9fb9a80c4e1a08823a7d00f67549d933600a7a