Change-Id: I51d5c26467b0e10e215838a02e6be81b6bc07ea9 Closes-Bug: #1470622 Depends-On: If71c9e2bbf888b1a68d3b7dc351f7df02f1a380f