Merge changes from topic "nomake" am: 1daca537ee am: c5d2629f77
am: 602d5971c9

Change-Id: Ie2ae3d4e4ebea9184a57ad9370fca40c53956231