am: 0c34313f Change-Id: I954c554edfabe66a9e946dd932761a2fac325b07
mentioned in commit 0722c879
mentioned in commit a77cdacb